Merge remote-tracking branch 'origin/master' into feature/android

author Po Lu <luangruo@yahoo.com>

Mon, 3 Jul 2023 06:30:12 +0000 (14:30 +0800)

committer Po Lu <luangruo@yahoo.com>

Mon, 3 Jul 2023 06:30:12 +0000 (14:30 +0800)
author Po Lu <luangruo@yahoo.com>
Mon, 3 Jul 2023 06:30:12 +0000 (14:30 +0800)
committer Po Lu <luangruo@yahoo.com>
Mon, 3 Jul 2023 06:30:12 +0000 (14:30 +0800)
diff --cc src/frame.c
Simple merge
diff --cc src/xfns.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Mon, 3 Jul 2023 06:30:12 +0000 (14:30 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Mon, 3 Jul 2023 06:30:12 +0000 (14:30 +0800)
		1	2
src/frame.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xfns.c	patch \|	diff1 \|	diff2 \|	blob \| history